projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0cb4fe6
)
pull: Properly propagate errors
author
Colin Walters
<walters@verbum.org>
Wed, 20 Jun 2012 19:42:41 +0000
(15:42 -0400)
committer
Colin Walters
<walters@verbum.org>
Wed, 20 Jun 2012 19:42:41 +0000
(15:42 -0400)
src/ostree/ostree-pull.c
patch
|
blob
|
history
diff --git
a/src/ostree/ostree-pull.c
b/src/ostree/ostree-pull.c
index a7be92dd262d77e4332d5cffa722d3eb64c1ab5d..156facf08369d0fbcf0da959a7c1da036ce7b0f6 100644
(file)
--- a/
src/ostree/ostree-pull.c
+++ b/
src/ostree/ostree-pull.c
@@
-185,11
+185,15
@@
check_outstanding_requests_handle_error (OtPullData *pull_data,
g_main_loop_quit (pull_data->loop);
if (error)
{
- pull_data->caught_error = TRUE;
- if (pull_data->async_error)
- g_error_free (error);
+ if (!pull_data->caught_error)
+ {
+ pull_data->caught_error = TRUE;
+ g_propagate_error (pull_data->async_error, error);
+ }
else
- g_propagate_error (pull_data->async_error, error);
+ {
+ g_error_free (error);
+ }
}
}